fix: remove merge-artifact lines in market_id_generator.rs breaking CI#765
Merged
greatest0fallt1me merged 2 commits intoJun 29, 2026
Merged
Conversation
solved issue
Two dangling lines left behind by an auto-resolved merge conflict
(-X theirs) caused an unclosed impl MarketIdGenerator block:
.extend_ttl(&key, env.storage().max_ttl(), env.storage().max_ttl());
}
These lines had no matching opening brace and were placed after
a doc-comment example, making the file uncompilable. Removal
restores the correct brace balance.
Also removes one extra blank line before the impl block closing
brace for consistency.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #648
Summary
Removes two dangling lines left behind from a merge conflict auto-resolved with -X theirs (origin/master commit 9f935b1).
Root Cause
In market_id_generator.rs:387-388, orphan code fragments remained after a doc-comment example. These lines had no matching opening brace, causing rustc to report impl MarketIdGenerator as unclosed and failing every CI run.
Change
Removes the two orphan lines and one trailing blank line before the impl block closing brace.
Impact
Fixes the cargo build step in the Soroban Smart Contracts CI workflow.